This repository was archived by the owner on Oct 28, 2024. It is now read-only.
Speed up builds with less sleeps steps #376
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
v1v
requested review from
ElWPenn,
cachedout,
kuisathaverat,
mdelapenya and
mikemadden42
v1v
changed the title
v1v
commented
Feb 5, 2020
vars/getVaultSecret.groovy
Outdated
| sleep randomNumber(min: 5, max: 10) | ||
| def token = getVaultToken(env.VAULT_ADDR, env.VAULT_ROLE_ID, env.VAULT_SECRET_ID) | ||
| props = getVaultSecretObject(env.VAULT_ADDR, secret, token) | ||
| retry(3) { |
Member
Author
There was a problem hiding this comment.
increased the number of retries a shorter sleep
vars/git.groovy
Outdated
| try { | ||
| body() | ||
| } catch(e) { | ||
| sleep(20) |
Member
Author
There was a problem hiding this comment.
Sleep only if it fails, then let's honor those steps that don't have a timeout issue
vars/withVaultToken.groovy
Outdated
| def token = getVaultSecret.getVaultToken(env.VAULT_ADDR, env.VAULT_ROLE_ID, env.VAULT_SECRET_ID) | ||
| dir(path) { | ||
| writeFile file: tokenFile, text: token | ||
| } | ||
| try { | ||
| body() | ||
| } catch (err) { | ||
| error "withVaultToken: error ${err}" |
Member
Author
There was a problem hiding this comment.
Unrequired error, throw err is the one in charge.
vars/git.groovy
Outdated
| @@ -36,7 +36,11 @@ def call(params) { | |||
| def retryWithSleep(int i, body) { | |||
| retry(i) { | |||
| log(level: 'DEBUG', text: "Let's git (${i} tries).") | |||
| sleep(20) | |||
| body() | |||
| try { | |||
Contributor
There was a problem hiding this comment.
I see a new step in the horizon 😄
sleepOnError(min: 0, max:30){
echo "I am a command"
}
def call(Map params = [:], Closure body) {
def min = params.containsKey('min') ? params.min : 0
def max = params.containsKey('max') ? params.max : 30
try{
body()
} catch (e){
sleep randomNumber(min: min, max: max)
throw e
}
}
Member
Author
There was a problem hiding this comment.
That's a good point, I actually was thinking to provide that step as a built-in step in the declarative pipeline:
retry(times: 3, sleep: 5)
Member
Author
There was a problem hiding this comment.
jenkinsci/workflow-basic-steps-plugin#97 is the one for that particular requirement :)
kuisathaverat
approved these changes
Feb 5, 2020
mdelapenya
reviewed
Feb 5, 2020
mdelapenya
approved these changes
Feb 5, 2020
v1v
changed the title
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Try/Catch errors and retry with a sleep.
Why is it important?
It will speed up the CI builds as the sleep doesn't happen firstly but only if there are failures.
The sleep was in place to ensure DDOS attack is not detected when running a bunch of parallel stages to interact with our systems, such as docker.registry and vault.
Related issues
This could be implemented with the proposal in jenkinsci/workflow-basic-steps-plugin#97
How to test this
Tests
From 12 seconds average to 2 seconds
From 30 seconds average to 18 seconds
From 1min and 40 seconds average to 24 seconds